merge trunk
authorK. Handa <handa@gnu.org>
Fri, 10 Jan 2014 23:26:10 +0000 (08:26 +0900)
committerK. Handa <handa@gnu.org>
Fri, 10 Jan 2014 23:26:10 +0000 (08:26 +0900)
commit955b97b655c886ef89fb813558e7c24424744144
tree60dc95f941e2f0fa947393207e59fc818476e316
parent8c0fc1f65e2defb28e1a25c21ebf1b4d4be3763d
parente42fcf1482e2c9e9d93f459985d13dbbabc61956
merge trunk